From cbab863627c02d4366e337e48e9d570110feb6e4 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 20 Nov 2001 17:42:56 +0000 Subject: [PATCH] Fix problem where notebook gap was double shifted by allocation.x/y Tue Nov 20 12:37:10 2001 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem where notebook gap was double shifted by allocation.x/y * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up to unmap children. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtknotebook.c | 12 ++++-------- 8 files changed, 60 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b32410d4c2..6d543ac54e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Nov 20 12:37:10 2001 Owen Taylor + + * gtk/gtknotebook.c (gtk_notebook_paint): Fix problem + where notebook gap was double shifted by allocation.x/y + + * gtk/gtknotebook.c (gtk_notebook_unmap): Chain up + to unmap children. + Tue Nov 20 14:49:59 2001 Tim Janik * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 498a52856d..f9f08c2113 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -834,6 +834,8 @@ gtk_notebook_unmap (GtkWidget *widget) GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); gdk_window_hide (GTK_NOTEBOOK (widget)->event_window); + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); } static void @@ -2443,19 +2445,13 @@ gtk_notebook_paint (GtkWidget *widget, switch (notebook->tab_pos) { case GTK_POS_TOP: - gap_x = (notebook->cur_page->allocation.x - border_width); - gap_width = notebook->cur_page->allocation.width; - break; case GTK_POS_BOTTOM: - gap_x = (notebook->cur_page->allocation.x - border_width); + gap_x = (notebook->cur_page->allocation.x - widget->allocation.x - border_width); gap_width = notebook->cur_page->allocation.width; break; case GTK_POS_LEFT: - gap_x = (notebook->cur_page->allocation.y - border_width); - gap_width = notebook->cur_page->allocation.height; - break; case GTK_POS_RIGHT: - gap_x = (notebook->cur_page->allocation.y - border_width); + gap_x = (notebook->cur_page->allocation.y - widget->allocation.y - border_width); gap_width = notebook->cur_page->allocation.height; break; } -- 2.30.2